<!DOCTYPE html>
<html lang="zh-CN">
  <head>
    <meta charset="UTF-8" />
    <meta
      name="viewport"
      content="width=device-width, initial-scale=1.0, maximum-scale=1.0, minimum-scale=1.0,user-scalable=no"
    />
    <meta http-equiv="X-UA-Compatible" content="ie=edge" />
    <title>Document</title>
    <link rel="stylesheet" href="./css/index.css">
  </head>
  <body>
    <div class="box1">
<<<<<<< HEAD
      <p>新增冲突内容</p>
=======
      <h1>增加冲突</h1>
>>>>>>> 6a2dd607f9f1d835f84acff63068dbbf9247c1f9
      <p>1.1创建的</p>
      <p>1.2新建</p>
      <h2>122221</h2>
      <h1>chenglin</h1>
      <p>李壮壮创建的分支login</p>
    </div>
  </body>
</html>
